Move some mnemonics around

svn path=/trunk/; revision=21073

diff --git a/ChangeLog b/ChangeLog
index 01c9d0c0388dc7925deba2d8b8296e0c850937fa..69caf49ca4c9e0e503871790b94037115d2380d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-11  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 547211 – Duplicated mnemonic
+
+       * gtk/gtkmountoperation.c: Change mnemonics around in 
+       the password dialog to avoid a conflict.
+       Reported by Gil Forcada
+
 2008-08-11  Sven Neumann  <sven@gimp.org>
 
        * gdk-pixbuf/gdk-pixbuf-loader.c: use canonical signal names.

diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index 8d17ba8848c6850e1d96da0a3691c1be4073eb3e..18f2a61a72c339a0f242b5be194d6de9bd9399b1 100644 (file)
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -587,7 +587,7 @@ gtk_mount_operation_ask_password (GMountOperation   *mount_op,
       gtk_box_pack_start (GTK_BOX (vbox), remember_box,
                           FALSE, FALSE, 0);
 
-      choice = gtk_radio_button_new_with_mnemonic (NULL, _("_Forget password immediately"));
+      choice = gtk_radio_button_new_with_mnemonic (NULL, _("Forget password _immediately"));
       g_object_set_data (G_OBJECT (choice), "password-save",
                          GINT_TO_POINTER (G_PASSWORD_SAVE_NEVER));
       g_signal_connect (choice, "toggled",
@@ -595,7 +595,7 @@ gtk_mount_operation_ask_password (GMountOperation   *mount_op,
       gtk_box_pack_start (GTK_BOX (remember_box), choice, FALSE, FALSE, 0);
 
       group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (choice));
-      choice = gtk_radio_button_new_with_mnemonic (group, _("_Remember password until you logout"));
+      choice = gtk_radio_button_new_with_mnemonic (group, _("Remember password until you _logout"));
       g_object_set_data (G_OBJECT (choice), "password-save",
                          GINT_TO_POINTER (G_PASSWORD_SAVE_FOR_SESSION));
       g_signal_connect (choice, "toggled",
@@ -603,7 +603,7 @@ gtk_mount_operation_ask_password (GMountOperation   *mount_op,
       gtk_box_pack_start (GTK_BOX (remember_box), choice, FALSE, FALSE, 0);
 
       group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (choice));
-      choice = gtk_radio_button_new_with_mnemonic (group, _("_Remember forever"));
+      choice = gtk_radio_button_new_with_mnemonic (group, _("Remember _forever"));
       g_object_set_data (G_OBJECT (choice), "password-save",
                          GINT_TO_POINTER (G_PASSWORD_SAVE_PERMANENTLY));
       g_signal_connect (choice, "toggled",